Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <[email protected]>
Fri, 19 Feb 2016 14:25:09 +0000 (09:25 -0500)
committerTom Rini <[email protected]>
Fri, 19 Feb 2016 14:25:09 +0000 (09:25 -0500)

Trivial merge